Fixed broken things
edited view a bit