Using Modal popups for add & Edit

Also restyled some things
Memoized Users