Tidied up view_finder a bit