[layout] more tweaking