moved to other packages
fixed label
Added navigation bar