Tweaking more UI elements. Now need to extract them into themes to do more reusability