Cleaned up templates for a cleaner theme for bootsrap.