Fixes and merges

You can go ahead and publish this. We can investigate the .btn-primary color later.  https://github.com/trigun0x2/hearthstats/issues/45