Fixing a few minor UI issues FEND-901