fix layout and extend utilities