Tons of layout fixes! New Widget