Change form layout for better cross-platform compatability