added TwbBundle and updated views and forms