Try to fix layout and other bugs.