Updated layout xml and added more strings for buttons