Fixed UI & Added Logout Button