[Issue #179] [WIP] fixes styling