debugging and layout adjustments