Fixed broken single entry layout