Fix color issues and alignment issues on Management