Refactored static fields and tweaked card border color a bit.