GUI clean ups and limit fixes