fiixing up layout