Cleaned up files, added navagation