3.00 20131218

layout fixes