Fixed Navigation. Cleaned up code Alot.