Fixed interface warnings and layouts