logout button and little cleanup