arm added plus some fixes for image gallery