Some fixes and look and feel updates.