Bug fixes + gallery working fully