fix hardcoded layout