Clean up &  Gallery Fix