Ui changes and fixed failling tests