Cleaned up some cruft
Center and rename button