Bug fixings & added pages