Fix more layouts, add latest updates from Rasel