Basic reformating of the UI