improved layout and more function and mode