Updated users and computers command, and re-arrange buttons