Added Max users in GUI & small tweaks