Added some constraints in the UI