Added logout button. Some layout changes