Buttons now draw correctly, no functionality yet