Added new draw button, small fixes