More command hiding and beautifying