minor improvements layout