tabs, new Model and other improvements