Little bit of a refactor surrounding image drawing
Update gradle bits