Improve views' UI