Layout bug changes, values now properly get updated