Changed button styles
Cleaned up challenge and battle templates