fixed bug that made view update too late
added shuffle button + some minor fixes
removed useless classes
removed double image
strange bug discovered