Add new styling and re-arrange html (GH #1)