Fixing up the UI