Fixed problem with collection view, added new buttons