Fixed UI layout issue
Fix layout issues