reorganized form, migrated styles to application.css