Can I re-arrange or edit my Shared Photostream Public Website?

I have a shared photostream, and I love the public website sharing! I have added alot of photos one by one, and the public website displays them in a linear fashion, instead of mosaic-style like it usually looks.

I know I can remove the pictures and re-add them, but all the likes and comments of my friends would be lost.

Is there a way I can edit or rearrange the look of the public website? If not, there should be! I would use andshare it alot more if I was happy with the way it looked.

Thanks for your time and help!