added navigation element, fixed some issues.