Fixed layout on forms and fixed some theme issues