alert layout, user & contractor management fixes