added collapser, removed dummy margins