ui improvements, re-worked the stub and added demo mode