Added buttons and logout