Fixes User Validation and some small TaskButtonPanel issues

Change-Id: I0dee3dad7507302b10729d17081eb3b2516e6746