Rewriting old structure
Removing unused and adding layout
Adding spinner