Basic loading indicators and additional enhancements from testing