Various updates and bug fixes. Changed collection view UI a bit to make it more clear.