fix focus issue
fix height issue