Add Gallery2 and re-order

Change-Id: Id2028be960bcbcc833bf96b9790f28526fed6e7b