Rearrange file layout
Add a clearfix to css