Merge pull request #14 from swamimalode07/feat/responsiveness-fixes