Some fixes in Layout and renamed files
Merge branch 'master' of github.com:Xenoage/OpenTune