Bug fix for small screens