Improved UI and added preview