Added errors, cleanup, nav menu