changed layout and options