Optimize page loads (fix for #998)

Fix for #998 . Big credits to @clone1018 :) !m clone1018

<!---
@huboard:{"order":729.0}
-->