UI improvments and necessary modifications in core