Fixes and new pages