Added and reworked game view, also fixed entities