data / layout fixes