Development

More changes to app along with minor fixes.