[UI] commands layout reorganized