Added a bunch of stuff, users work, time to make it look nice