Height calculation improvements. Now using Autolayout