fix: styling and look
merge styling