Add HashMap version, draw loop easier to understand and use
Update screen size