Add bundle and shared layout