Adding changes to make UI more malleable