Added timeout + Added features to web interface