Fixed styling and add/remove logic

Removed dependency to bootstrap.js