Final last tweaks and added home button and logout button