Tidied up show and form files to display relavent info