Improved UI - added bootstrap