More draw activities, some layout fixes.
Merge branch 'master' of github.com:PencilCode/fieldhouse