Both server and client side of gallery has been improved.