Remove Debugging and Fix PNL Layout