Final fixex at UI task 04