Refactored for Bootstrap