Rearranged app parts