Yet another UI Improvement commit