Improve interface for small devices