Improved Index and logout button