Cleanup, moved styles and images so they get built