Fixed most drawing bugs now - on to home & join forms