Improved Responsive UI