made some more chnages in the layout, add the button functionalities