Restored responsive behaviour, this time works better