Rev 2, fixed menu and added links