Clearer drawing code, added simple resolution