form styling
Merge branch 'javier'