.... fixes & logout button :p