Several changes... added backbutton to more pages, added a bug in uri
Merge remote-tracking branch 'origin/master'