Few UI improvements & Fixes