Finised CSS clean up, updated HTML structure