Fixed text issue and made better height flexability