Minor improvements
Small screen adjustment