Improved UI look and functionality