Fixed warnings in layout