major fixes; UI overhaul