Fixed clear issues and renamed most divs