Added the visa card functionality and fixed a few issues