Cleaned up, Logic in moving cards to top now works