Added bundles and layout
Updated layout and stuff