cleanup
modified some base code. started main navigation