Bug and styling fixes