image gallery layout re-arrange
pulled changes merge