Fix #83 + electee page UI