Updated for FlowLayout