moved some files, added tabs and remade bckgrnds
Merge branch 'master' into Robbin