Interface fix, modify at https://sketchboard.me/ZyTSMkDLOitZ