improvements for mobile and tab versions