Updated several templates; removed the upper menu bar