Added logout button
fixed some minor issues