UI Quickfixes on UI