improves L&F and fixes up empty states