Sure, moving it to layout