Some UI changes. More spaghetti code.