A few fixes and added constraints to UI.