Added more info page
Removed settings page
Updated template
Added calculate trend method
Merge branch 'refs/heads/alex'