Snow Leopard UI fixes and minor code improvements