Fixed annoying CSS bug with overflows and collapsing margins