make fixes, add new pages