done with users module and design changes
resolved conflicts