Organized the UI