removing sidebar, admin, selector
merge conflicts