Fixing layout and other bugs