A few more 'once' functions and a little layout cleanup.