D'oh
Added busy indicator
Better HTML construction