Updated sizes and scaling etc