Main module circuit layout updates
Merge branch 'master' of https://github.com/hashinisenaratne/SIFEB