tweaked user and team layouts, fixed some layout bugs