Fix #144 - Fix warnings in layout