Improved UI
Version 1.1