Added focus styles & fixed layout issue