Rearranged components and fixed scroll