Fixed Nav and added icons