More changes to logic and UI