Users almost done

Functionality is there, I'm just waiting for Metys to help me with styling