fix top border
staff edit page started
route old to 3000
merge master