Updated layouts in all forms to make them consistent