Added partial work on gallery