Updating to more modern view framework