Clean up, remove key relation on user, colors working for sidebar