last ui touches from Ryan for a while...