Added settings and moved around handlers