Commit before messing with layout