Added push/pop state for URL's
Code Cleanup