Update feature: Minor layout additions with better naming tags for content