fixed backend pages
fixed merge
updating options