Updated layout (no displaying empty elements)