bug fixes
current page selected issue fixed