Page loader loading and some small fixes