Build related UI fixes
## Before

## After

See merge request !2015