Further improve panel UI