Fixed page flow
merge and restored files