Make it faster

All the page load fixes combined into one Pull Request

Contains
- #208 
- #209 
- #210 
- #211