Fixed the double commit/layout issue