added buttons, updated layout