More work done
Added navigation