improved ui, added controls