Improving original widget padding/UI