Updated and cleaned design