Improved the layouts responsiveness