Fixed rendering issues on small devices;
Fixed spinner