Added text control, updated styles, and cleaned up