layout adjust
fixed some accessibility issues