layout
bug fixes