Meaningfull Commit (Fixed all problems from Week2, except Thumbnail Grid and Edit function)