Changed dictionary, and added scalable layout