manually dealt with all merge conflicts between button styles and layout styles
experimenting with merge from rob_v6