Reworked form horizontal alignment