constraint and UI fixes