added progress and nav bar
fixed progress bar