Fixed few bugs and improved collection pages!