Fixed up text display and broke out construction into parts