Changing label widths to a more dynamic
Remove extra spacing