Cleanup styles layout
Rename js file and fix for contact form errors