Fixed focus issue and some layout changes
more layout changes