Improved Auto layout constraints.
Small Refactor