Some progress
Added navigation