Fixed bug with storage remove. Fixed spacing