Making improvements to the reponsiveness. Work in progress.
Merged conflicts.