Added changes from staging (w/c should have been done here)
Fixed errors
Added Bitcoin button