UI fixes and headings changed