things renamed, unused code removed, views updated to render text from messages file, unused routes removed
merged conflicts resolved