1. Minor tweaking on UI