More changes for the UI, slowly debugging...