cleaned up code, finished nav