More changes to user interface and pieces