fixes a conversion issue and updates layout