Fixes forms, structure, theme problems optimization