fixing most of bugs, re-arrangement urls, pages