optimise for 1024px screen
reorder under the hood
move popimage to component folder