Merge pull request #30 from krisrybak/navigation

Navigation
Moved BundleListener to LayoutBundle
Improves readabilty of the file