Cleaning up buttons / data view