Small tweaks on layout and commands