fix source layout and touch up system requriements