Stylings and a UI improvements