User control panel fixed, fixes #6