Added hack and image fixes and wired up view