US538: Fixing issues with the UI