Includes more eager loading
eager loading
Eager Loading and some CSS tweaks
merges with master