Changes In Grid and Buttons