style improvements. layout improvements