Fix #1
Update User Interface
Apply Core-Module Fix