Added spinner, fixer folder size, some layout fixes