Removed expansion and slightly refactored text view.