Merge of projects #2

Engine-changes, UI, background, view and other random things