#7: Fixed existing layout constraints and added a few new generic ones