Cleaned up the UI for steps