buttons need styling
fixing conflicts