More UI done, need to draw points/lines still