Added basic menu & fixed client timeouts