general layout cleanup