Popup drawing code is done.
Fixed stroke issue (only draws inside the border now)