Design new layout for buttons and apply wherever required to be consistent