adjusting displays
solving conflicts
minor adjustment