Improve for smaller displays