#6 Add loading indicator, small fixes