changes in layout, added buttons