Refactor

Refactor and Begin Card Top