Start working on better command layout