improved UI and fixed few bugs