New and fixed Trebuchet Widget Layout