Design Fixes as per @jancborchardt