Minor view improvements, removed some debug