[Update] Move alignment from PS to VS for more consistent behaviour [Remove] Remove magic alignment values no longer needed in PS