Minor Code cleanup; font change; removed OneScroll