Added logout button, fixed footer overlap
Resovlving conflicts