Extracted new components
Spin in half a minute
Removed some console.logs