User control panel fixed, fixes #7