Added Draper and cleaned up frontend code