Bug fix #5: ui small changes