some fixes and page ctrl