made clearfix for fixed nav
merging
fixed merge conflict
layout made dynamic with jquery