Fixing separators
Better alignment