Fix .btn color and refine to match style of .btn-outline
Refactor .btn and .btn-outline css class structure.