quick bug / layout fixes