Added tags toggles + slight layout adjustments