UI prototypes, small fixes.