Fix apartmentId routing logic, theme some forms
Prettify forms