Changes to Ui and maps