Minor changes. Back button needs fixing