Added menu items and implemented switch user