Improved the appearance of empty state messages
Merge branch 'feature/better-empty-message' into develop