Refactors and improves layout files of System module