Modified column conditions a bit + changed doctype

Signed-off-by: Itthiphol <itthiphol@gmail.com>