[IMP] misc layout improvements