Minor changes -- Added popups etc.