Dev: Bugfix #11 and #13 && Task 2 (edit resource)