Add Logout and Improve Highlighting