multiple visual improvements
fixed conflict