Improve pages of CLI