Clean up width adjustments.
#MBL-10063 Fixed
#MBL-10066 Fixed
#MBL-10067 Fixed