Cleanup and rearranging of CSS & main index