update layout to ugly but working