fixed button
Merge remote-tracking branch 'origin/base_template' into b_template
deleted nav