Deleted unused tempalte
Tweaked presentation
Functional pm