major UI overhaul
merging heads