UI: Added bunch of improvements