Fixed logout, style / layout changes