Final update(!) - UI changes due to feedback

Final changes - implemented small changes due to feedback.