Add bootstrap and enhance usability