more tweaking to layout