Changed to Fragment and style changes