Cleaned up layout. Fixed add bug. Implemented a "temporary bandaid fix" to clear the numbers.