Upgrade to bootstrap3, add orders, many improvements and fixes