layout cleanup

All.The.Work.While.Crying.