fixed bug; improved UI