Fixed bugs & added 404 pages