updated with dashboard navigation etc