Fixes the UI in a more decent and semantic way