multiple layout adjustments. bug fixing