Fixed Customer UI - minor