Minor bug fixes and added collection gallery layout