Added new buttons
Updated Layout