Restyled to use flexboxes