Features cleanup

Added content placeholders for search and image promotion in apps feature
Other stuff is just tidyup.