Updated Show page and halfway through Edit page