Some refactoring, using margins for position