Added reset, and fixed UI