finished extra form style
Merge branch 'style' into dev
quick fixes