Logout button added & general clean up