Fixes

If the buttons get dark adjust text colour
Small changes