added expander text and fixed spacing issues