Added Grid for Users, and few other smaller functions.