addition of buttons, small content fixes