Some application layout cleanup