Fixed layout and added margin in between the buttons