Fixed problems with startscreen
Merged with origin/master