improve command center layout and add some tests