Various layout cleanup