Modified to work on polymer .51

Modifed to work on polymer .51 and improved layout.