Clean up Styles folder, Fix Company form, remove unused layouts