Fixed Bugs on EIA
Merge branch 'master' of https://github.com/irunguh/portal