Enhanced UI and added some specs