New Structure

Changed implementation to use bootstrap