Fix #653: nux design tweaks

Fix #653