Merge pull request #5801 from netchampfaris/ui-fixes

fix pos layout #5780