clearfix improvment + minor tweaks