added bullet and some eager loading
added some further caching to layout