fixed behaviour and styling