fix issues with colision, add button graphics, fix draw order