Re-attack the layout

Thanks for overflow:hidden;