Improved Layout and changed code for buttons