Minor Cosmetic Fixes and added Button for Log Out