Improved Parser logic
Added padding around Layout labels