#234, 235, fix font sizes and modals