Got all the resolutions working. Removed some useless classes. Added a scale factor