updated Layout, added Loading Wheel, added refresh