Cleanup webpages and improve cpu usage
 Merge Changes from Pi Copy of the Code
Fix Minor Bugs