Cleaning up a css conflict and some left over messages