BUGFIX: improve alignment
BUGFIX: merge played up correct visual styles