Fixing up ui