Readjust graphic elements to be more clean