Some update of the UI to make the areas more defined