Manage margin (for bar such as dzen) + some cleaning