added buttons and layout tweeks