Added model selector and tweaked interface