Fix/prettify forms

Small changes in the layout, added glyhpicons and other minor updates