some more fixes to the UI constraints