rearrangement of containers position and jsp inclusions