Further cleanup in layout