Fix styling of InlineComponent in both default & IFRC templates, Partial Fix for Validation of entries, remove old fn