Few UI changes
Few small tweaks