Added ENV vars, changed view