Making popups nicer, other stuff
Better name spaceing in case they want both on same screen