Fixing responsive display and other bugs