More Progress on final layout design