Style fixes, button icons
Modal form fix
Merge branch 'master' of https://github.com/ernis9112/zwazaaz