removed all *~
changed layout