Adjusted Constraints

Constraints now provide a better UI