Added code for buttons and map