Layout tweaks; removed old file