[IMP] better layout and options