my version

cleaning up code, fixed navigation