Consistent Graphics and Naming

Still some list creation bugs.