Fix/style adjustments