Fix body min width + some tiny refactoring