Switch to Bootstrap.js for styling
Finish merge