Some changes
Some fixes, and adding navigation to posts
Merges