Some cleanups, controls width and height dependencies