Modified Navigation
Cleaned up to files
Cleaned up more files