Positioning and loading UI updated
Added tests