Adding fit-width and fit-height