Added loading functionality & Tweaks

Added loading functionality  & Tweaks to JS/LESS