UI changes as desired by Joep