adding settings and promos views; code cleanup