adding button styling
fixing conflicts