Small bugfixes
finnished design of editscreen and viewscreen
Added logic to viewscreen
Fixed mergeconflicts