Some minor adjustments.
PS. Was trying to add a loading bar!! .. But didnt work out :'(