Major usabilty improvements