Few fixes for small screens