Layout and styles progress
pull and merge