Fixing UI again because accidentally reverted last commit