Fix for embedded pages
Adding files and fix is current page
Fix menu current page