Moving things around for proper saving and display