layout tweaks
null value support added