some changes to layout - merry christmas