Added more content, icons, theming