UI constraints fix