Some UI fixes, request fix