Added resizing and improved UI