updating user and aggregate, and some cleanup and styles