Fixed bug in removing first location and removed startup flicker