Updated layout
Set focus on clicking