Added toString
Improved ui