Updated several templates; removed upper menu bar